@llvm/pr-subscribers-libcxx

Author: Victor Campos (vhscampos)

diff --git a/libcxx/test/std/depr/depr.c.headers/uchar_h.compile.pass.cpp b/libcxx/test/std/depr/depr.c.headers/uchar_h.compile.pass.cpp
index a1560c8ee5853c..2b64554666817d 100644
--- a/libcxx/test/std/depr/depr.c.headers/uchar_h.compile.pass.cpp
+++ b/libcxx/test/std/depr/depr.c.headers/uchar_h.compile.pass.cpp
@@ -11,9 +11,6 @@
 // Apple platforms don't provide <uchar.h> yet, so these tests fail.
 // XFAIL: target={{.+}}-apple-{{.+}}
 
-// mbrtoc16 not defined.
-// XFAIL: LIBCXX-PICOLIBC-FIXME
-
 // <uchar.h>
 
 #include <uchar.h>
diff --git a/libcxx/test/std/strings/c.strings/cuchar.compile.pass.cpp b/libcxx/test/std/strings/c.strings/cuchar.compile.pass.cpp
index 2076384deb2b23..db00cbde333658 100644
--- a/libcxx/test/std/strings/c.strings/cuchar.compile.pass.cpp
+++ b/libcxx/test/std/strings/c.strings/cuchar.compile.pass.cpp
@@ -11,9 +11,6 @@
 // Apple platforms don't provide <uchar.h> yet, so these tests fail.
 // XFAIL: target={{.+}}-apple-{{.+}}
 
-// mbrtoc16 not defined.
-// XFAIL: LIBCXX-PICOLIBC-FIXME
-
 // <cuchar>
 
 #include <cuchar>

The test failures seem to be present in other Pull Requests on the libcxx component, so I believe they are spurious or unrelated to this specific patch.

It seems that this patch can only land after the CI pipelines update their picolibc to a version that contains picolibc/picolibc@f6f6875 as this was when support for char16_t and char32_t was introduced.

@mplatings Can you please have a look?

@vhscampos It might be sufficient to do this:

diff --git a/libcxx/utils/ci/build-picolibc.sh b/libcxx/utils/ci/build-picolibc.sh
index 521c1bef9fc7..6913d1d15a1a 100755
--- a/libcxx/utils/ci/build-picolibc.sh
+++ b/libcxx/utils/ci/build-picolibc.sh
@@ -70,7 +70,7 @@ picolibc_build_dir="${build_dir}/picolibc-build"
 mkdir -p "${picolibc_source_dir}"
 mkdir -p "${picolibc_build_dir}"
 # Download a known good version of picolibc.
-picolibc_commit="48fbc2009c6473293d03d5ec6f190565c6223a5c"
+picolibc_commit="f6f68758fe2aa62854f49b90c3daeeb08242b512"
 curl -L "https://github.com/picolibc/picolibc/archive/${picolibc_commit}.zip" --output "${picolibc_source_dir}/picolibc.zip"
 unzip -q "${picolibc_source_dir}/picolibc.zip" -d "${picolibc_source_dir}"
 mv "${picolibc_source_dir}/picolibc-${picolibc_commit}"/* "${picolibc_source_dir}"

Updating the picolibc commit will potentially affect other tests due in bringing in more changes. My suggestion was to wait for the next release of picolibc so that a stable version can be used, then update all the tests for that.

I'd be fine with that. When's the next release of picolibc planned?

Gentle ping on this patch.

@ldionne I am still waiting on the next release of picolibc. I should receive a notification from GitHub once it's done, then I can get this PR merged.

@ldionne
We got a new picolibc release: 1.8.9.

PR to bump the version: #126074

This and the bump should probably land together, since the CI will fail otherwise.

Updating to v1.8.9 causes several failures related to locale. So this can't be merged until the failures are investigated and fixed.

Temporarily closing the PR to clear up the review queue. Please reopen when you pick up this task again.